diff --git a/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol b/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol
index dd917125..9e00fdfa 100644
--- a/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol
+++ b/contracts/arbitrum/connectors/uniswap/v3_swap/helpers.sol
@@ -43,7 +43,6 @@ abstract contract Helpers is DSMath, Basic {
 		BuyInfo memory buyData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _buyAmt = getUint(buyData.getId, buyData.buyAmt);
@@ -102,7 +101,6 @@ abstract contract Helpers is DSMath, Basic {
 		SellInfo memory sellData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _sellAmt = getUint(sellData.getId, sellData.sellAmt);
diff --git a/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol b/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
index 13a68b9e..0c67b8d0 100644
--- a/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/arbitrum/connectors/uniswap/v3_swap/main.sol
@@ -16,13 +16,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Buy Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of sellAmt/buyAmt with slippage
-     * @param buyAmt amount of token to be bought
-     * @param getId Id to get buyAmt
-     * @param setId Id to store sellAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of sellAmt/buyAmt with slippage
+     * @param _buyAmt amount of token to be bought
+     * @param _getId Id to get buyAmt
+     * @param _setId Id to store sellAmt
      */
     function buy(
         address _buyAddr,
@@ -47,13 +47,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Sell Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of buyAmt/sellAmt with slippage
-     * @param sellAmt amount of token to be sold
-     * @param getId Id to get sellAmt
-     * @param setId Id to store buyAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of buyAmt/sellAmt with slippage
+     * @param _sellAmt amount of token to be sold
+     * @param _getId Id to get sellAmt
+     * @param _setId Id to store buyAmt
      */
     function sell(
         address _buyAddr,
diff --git a/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol b/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol
index 2f0e0f9e..2e5e6931 100644
--- a/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol
+++ b/contracts/mainnet/connectors/uniswap/v3_swap/helpers.sol
@@ -43,7 +43,6 @@ abstract contract Helpers is DSMath, Basic {
 		BuyInfo memory buyData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _buyAmt = getUint(buyData.getId, buyData.buyAmt);
@@ -102,7 +101,6 @@ abstract contract Helpers is DSMath, Basic {
 		SellInfo memory sellData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _sellAmt = getUint(sellData.getId, sellData.sellAmt);
diff --git a/contracts/mainnet/connectors/uniswap/v3_swap/main.sol b/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
index 371d18d4..54086cf0 100644
--- a/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/mainnet/connectors/uniswap/v3_swap/main.sol
@@ -16,13 +16,13 @@ abstract contract UniswapResolver is Helpers, Events {
     /**
      * @dev Buy Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of sellAmt/buyAmt with slippage
-     * @param buyAmt amount of token to be bought
-     * @param getId Id to get buyAmt
-     * @param setId Id to store sellAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of sellAmt/buyAmt with slippage
+     * @param _buyAmt amount of token to be bought
+     * @param _getId Id to get buyAmt
+     * @param _setId Id to store sellAmt
      */
     function buy(
         address _buyAddr,
@@ -47,13 +47,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Sell Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of buyAmt/sellAmt with slippage
-     * @param sellAmt amount of token to be sold
-     * @param getId Id to get sellAmt
-     * @param setId Id to store buyAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of buyAmt/sellAmt with slippage
+     * @param _sellAmt amount of token to be sold
+     * @param _getId Id to get sellAmt
+     * @param _setId Id to store buyAmt
      */
     function sell(
         address _buyAddr,
diff --git a/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol b/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol
index c0f2e442..ea5cb22a 100644
--- a/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol
+++ b/contracts/optimism/connectors/uniswap/v3_swap/helpers.sol
@@ -43,7 +43,6 @@ abstract contract Helpers is DSMath, Basic {
 		BuyInfo memory buyData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _buyAmt = getUint(buyData.getId, buyData.buyAmt);
@@ -102,7 +101,6 @@ abstract contract Helpers is DSMath, Basic {
 		SellInfo memory sellData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _sellAmt = getUint(sellData.getId, sellData.sellAmt);
diff --git a/contracts/optimism/connectors/uniswap/v3_swap/main.sol b/contracts/optimism/connectors/uniswap/v3_swap/main.sol
index b60c1091..0bd9a79d 100644
--- a/contracts/optimism/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/optimism/connectors/uniswap/v3_swap/main.sol
@@ -16,13 +16,13 @@ abstract contract UniswapResolver is Helpers, Events {
     /**
      * @dev Buy Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of sellAmt/buyAmt with slippage
-     * @param buyAmt amount of token to be bought
-     * @param getId Id to get buyAmt
-     * @param setId Id to store sellAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of sellAmt/buyAmt with slippage
+     * @param _buyAmt amount of token to be bought
+     * @param _getId Id to get buyAmt
+     * @param _setId Id to store sellAmt
      */
     function buy(
         address _buyAddr,
@@ -47,13 +47,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Sell Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of buyAmt/sellAmt with slippage
-     * @param sellAmt amount of token to be sold
-     * @param getId Id to get sellAmt
-     * @param setId Id to store buyAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of buyAmt/sellAmt with slippage
+     * @param _sellAmt amount of token to be sold
+     * @param _getId Id to get sellAmt
+     * @param _setId Id to store buyAmt
      */
     function sell(
         address _buyAddr,
diff --git a/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol b/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol
index 99aa353d..ef2fb3c4 100644
--- a/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol
+++ b/contracts/polygon/connectors/uniswap/v3_swap/helpers.sol
@@ -43,7 +43,6 @@ abstract contract Helpers is DSMath, Basic {
 		BuyInfo memory buyData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _buyAmt = getUint(buyData.getId, buyData.buyAmt);
@@ -102,7 +101,6 @@ abstract contract Helpers is DSMath, Basic {
 		SellInfo memory sellData
 	)
 		internal
-		payable
 		returns (string memory _eventName, bytes memory _eventParam)
 	{
 		uint256 _sellAmt = getUint(sellData.getId, sellData.sellAmt);
diff --git a/contracts/polygon/connectors/uniswap/v3_swap/main.sol b/contracts/polygon/connectors/uniswap/v3_swap/main.sol
index 8d71f28b..a43ba7ab 100644
--- a/contracts/polygon/connectors/uniswap/v3_swap/main.sol
+++ b/contracts/polygon/connectors/uniswap/v3_swap/main.sol
@@ -15,13 +15,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Buy Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of sellAmt/buyAmt with slippage
-     * @param buyAmt amount of token to be bought
-     * @param getId Id to get buyAmt
-     * @param setId Id to store sellAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of sellAmt/buyAmt with slippage
+     * @param _buyAmt amount of token to be bought
+     * @param _getId Id to get buyAmt
+     * @param _setId Id to store sellAmt
      */
     function buy(
         address _buyAddr,
@@ -47,13 +47,13 @@ abstract contract UniswapResolver is Helpers, Events {
 	/**
      * @dev Sell Function
      * @notice Swap token(sellAddr) with token(buyAddr), buy token with minimum sell token
-     * @param buyAddr token to be bought
-     * @param sellAddr token to be sold
-     * @param fee pool fees for buyAddr-sellAddr token pair
-	 * @param unitAmt The unit amount of buyAmt/sellAmt with slippage
-     * @param sellAmt amount of token to be sold
-     * @param getId Id to get sellAmt
-     * @param setId Id to store buyAmt
+     * @param _buyAddr token to be bought
+     * @param _sellAddr token to be sold
+     * @param _fee pool fees for buyAddr-sellAddr token pair
+	 * @param _unitAmt The unit amount of buyAmt/sellAmt with slippage
+     * @param _sellAmt amount of token to be sold
+     * @param _getId Id to get sellAmt
+     * @param _setId Id to store buyAmt
      */
     function sell(
         address _buyAddr,