diff --git a/src/contracts/pools/FixedRateExchange.ts b/src/contracts/pools/FixedRateExchange.ts
index f390cc3d..364cb2fb 100644
--- a/src/contracts/pools/FixedRateExchange.ts
+++ b/src/contracts/pools/FixedRateExchange.ts
@@ -34,7 +34,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estBuyDT(
+  public async estGasBuyDT(
     account: string,
     datatokenAddress: string,
     dtAmount: string,
@@ -127,7 +127,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSellDT(
+  public async estGasSellDT(
     account: string,
     datatokenAddress: string,
     dtAmount: string,
@@ -228,7 +228,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSetRate(
+  public async estGasSetRate(
     account: string,
     exchangeId: string,
     newRate: string,
@@ -280,7 +280,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSetAllowedSwapper(
+  public async estGasSetAllowedSwapper(
     account: string,
     exchangeId: string,
     newAllowedSwapper: string,
@@ -331,7 +331,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estActivate(
+  public async estGasActivate(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -374,7 +374,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estDeactivate(
+  public async estGasDeactivate(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -621,7 +621,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estActivateMint(
+  public async estGasActivateMint(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -668,7 +668,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estDeactivateMint(
+  public async estGasDeactivateMint(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -723,7 +723,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectBT(
+  public async estGasCollectBT(
     account: string,
     exchangeId: string,
     amount: string,
@@ -788,7 +788,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectDT(
+  public async estGasCollectDT(
     account: string,
     exchangeId: string,
     amount: string,
@@ -853,7 +853,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectMarketFee(
+  public async estGasCollectMarketFee(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -896,7 +896,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectOceanFee(
+  public async estGasCollectOceanFee(
     account: string,
     exchangeId: string,
     contractInstance?: Contract
@@ -983,7 +983,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estUpdateMarketFee(
+  public async estGasUpdateMarketFee(
     account: string,
     exchangeId: string,
     newMarketFee: string,
@@ -1035,7 +1035,7 @@ export class FixedRateExchange extends SmartContractWithAddress {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estUpdateMarketFeeCollector(
+  public async estGasUpdateMarketFeeCollector(
     account: string,
     exchangeId: string,
     newMarketFeeCollector: string,
diff --git a/src/contracts/pools/Pool.ts b/src/contracts/pools/Pool.ts
index 3322661a..4685dac4 100644
--- a/src/contracts/pools/Pool.ts
+++ b/src/contracts/pools/Pool.ts
@@ -57,7 +57,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSetSwapFee(
+  public async estGasSetSwapFee(
     account: string,
     poolAddress: string,
     fee: string,
@@ -479,7 +479,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectOPC(
+  public async estGasCollectOPC(
     address: string,
     poolAddress: string,
     contractInstance?: Contract
@@ -520,7 +520,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estCollectMarketFee(
+  public async estGasCollectMarketFee(
     address: string,
     poolAddress: string,
     contractInstance?: Contract
@@ -569,7 +569,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estUpdatePublishMarketFee(
+  public async estGasUpdatePublishMarketFee(
     address: string,
     poolAddress: string,
     newPublishMarketAddress: string,
@@ -638,7 +638,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSwapExactAmountIn(
+  public async estGasSwapExactAmountIn(
     address: string,
     poolAddress: string,
     tokenInOutMarket: TokenInOutMarket,
@@ -781,7 +781,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSwapExactAmountOut(
+  public async estGasSwapExactAmountOut(
     address: string,
     poolAddress: string,
     tokenInOutMarket: TokenInOutMarket,
@@ -919,7 +919,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estJoinswapExternAmountIn(
+  public async estGasJoinswapExternAmountIn(
     address: string,
     poolAddress: string,
     tokenAmountIn: string,
@@ -1001,7 +1001,7 @@ export class Pool extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estExitswapPoolAmountIn(
+  public async estGasExitswapPoolAmountIn(
     address: string,
     poolAddress: string,
     poolAmountIn: string,
diff --git a/src/contracts/pools/SideStaking.ts b/src/contracts/pools/SideStaking.ts
index 006661da..2558b5c1 100644
--- a/src/contracts/pools/SideStaking.ts
+++ b/src/contracts/pools/SideStaking.ts
@@ -243,7 +243,7 @@ export class SideStaking extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estGetVesting(
+  public async estGasGetVesting(
     account: string,
     ssAddress: string,
     datatokenAddress: string,
@@ -295,7 +295,7 @@ export class SideStaking extends SmartContract {
    * @param {Contract} contractInstance optional contract instance
    * @return {Promise<number>}
    */
-  public async estSetPoolSwapFee(
+  public async estGasSetPoolSwapFee(
     account: string,
     ssAddress: string,
     datatokenAddress: string,
diff --git a/src/contracts/tokens/NFT.ts b/src/contracts/tokens/NFT.ts
index e867103f..800ba68c 100644
--- a/src/contracts/tokens/NFT.ts
+++ b/src/contracts/tokens/NFT.ts
@@ -27,7 +27,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasCreateErc20(
+  public async estGasGasCreateErc20(
     nftAddress: string,
     address: string,
     minter: string,
@@ -136,7 +136,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasAddManager(
+  public async estGasGasAddManager(
     nftAddress: string,
     address: string,
     manager: string,
@@ -181,7 +181,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasRemoveManager(
+  public async estGasGasRemoveManager(
     nftAddress: string,
     address: string,
     manager: string,
@@ -225,7 +225,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasAddErc20Deployer(
+  public async estGasGasAddErc20Deployer(
     nftAddress: string,
     address: string,
     erc20Deployer: string,
@@ -280,7 +280,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasRemoveErc20Deployer(
+  public async estGasGasRemoveErc20Deployer(
     nftAddress: string,
     address: string,
     erc20Deployer: string,
@@ -342,7 +342,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasAddMetadataUpdater(
+  public async estGasGasAddMetadataUpdater(
     nftAddress: string,
     address: string,
     metadataUpdater: string,
@@ -459,7 +459,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasAddStoreUpdater(
+  public async estGasGasAddStoreUpdater(
     nftAddress: string,
     address: string,
     storeUpdater: string,
@@ -512,7 +512,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasRemoveStoreUpdater(
+  public async estGasGasRemoveStoreUpdater(
     nftAddress: string,
     address: string,
     storeUpdater: string,
@@ -570,7 +570,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasCleanPermissions(
+  public async estGasGasCleanPermissions(
     nftAddress: string,
     address: string,
     contractInstance?: Contract
@@ -621,7 +621,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasTransferNft(
+  public async estGasGasTransferNft(
     nftAddress: string,
     nftOwner: string,
     nftReceiver: string,
@@ -691,7 +691,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasSafeTransferNft(
+  public async estGasGasSafeTransferNft(
     nftAddress: string,
     nftOwner: string,
     nftReceiver: string,
@@ -763,7 +763,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasSetMetadata(
+  public async estGasGasSetMetadata(
     nftAddress: string,
     metadataUpdater: string,
     metadataState: number,
@@ -851,7 +851,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasSetMetadataAndTokenURI(
+  public async estGasGasSetMetadataAndTokenURI(
     nftAddress: string,
     metadataUpdater: string,
     metadataAndTokenURI: MetadataAndTokenURI,
@@ -913,7 +913,7 @@ export class Nft extends SmartContract {
    * @param {Contract} nftContract optional contract instance
    * @return {Promise<any>}
    */
-  public async estGasSetMetadataState(
+  public async estGasGasSetMetadataState(
     nftAddress: string,
     metadataUpdater: string,
     metadataState: number,
@@ -968,7 +968,7 @@ export class Nft extends SmartContract {
    * @param data input data for TokenURI
    * @return {Promise<TransactionReceipt>} transaction receipt
    */
-  public async estSetTokenURI(
+  public async estGasSetTokenURI(
     nftAddress: string,
     address: string,
     data: string