diff --git a/src/contracts/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts
index 196a3f70..db693064 100644
--- a/src/contracts/factories/NFTFactory.ts
+++ b/src/contracts/factories/NFTFactory.ts
@@ -620,14 +620,14 @@ export class NftFactory extends SmartContractWithAddress {
   }
 
   /**
-   * Estimate gas cost for createNftErc20WithPool method
+   * Estimate gas cost for createNftWithDatatokenWithPool method
    * @param address Caller address
    * @param nftCreateData input data for NFT Creation
    * @param ercParams input data for Datatoken Creation
    * @param poolParams input data for Pool Creation
    * @return {Promise<TransactionReceipt>} transaction receipt
    */
-  public async estGasCreateNftErc20WithPool(
+  public async estGasCreateNftWithDatatokenWithPool(
     address: string,
     nftCreateData: NftCreateData,
     ercParams: DatatokenCreateParams,
@@ -645,7 +645,7 @@ export class NftFactory extends SmartContractWithAddress {
   }
 
   /**
-   * @dev createNftErc20WithPool
+   * @dev createNftWithDatatokenWithPool
    *      Creates a new NFT, then a Datatoken, then a Pool, all in one call
    *      Use this carefully, because if Pool creation fails, you are still going to pay a lot of gas
    * @param address Caller address
@@ -654,7 +654,7 @@ export class NftFactory extends SmartContractWithAddress {
    * @param poolParams input data for Pool Creation
    * @return {Promise<TransactionReceipt>} transaction receipt
    */
-  public async createNftErc20WithPool(
+  public async createNftWithDatatokenWithPool(
     address: string,
     nftCreateData: NftCreateData,
     ercParams: DatatokenCreateParams,
diff --git a/test/integration/CodeExamples.test.ts b/test/integration/CodeExamples.test.ts
index a8966f5d..c283e58e 100644
--- a/test/integration/CodeExamples.test.ts
+++ b/test/integration/CodeExamples.test.ts
@@ -291,7 +291,7 @@ describe('Marketplace flow tests', async () => {
     /// ```
     /// Now we can make the contract call
     /// ```Typescript
-    const tx = await factory.createNftErc20WithPool(
+    const tx = await factory.createNftWithDatatokenWithPool(
       publisherAccount,
       nftParams,
       datatokenParams,
diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts
index 1d2b803c..71abb42d 100644
--- a/test/integration/PublishFlows.test.ts
+++ b/test/integration/PublishFlows.test.ts
@@ -133,7 +133,7 @@ describe('Publish tests', async () => {
       swapFeeMarketRunner: '0.001'
     }
 
-    const bundleNFT = await factory.createNftErc20WithPool(
+    const bundleNFT = await factory.createNftWithDatatokenWithPool(
       publisherAccount,
       nftParams,
       datatokenParams,
diff --git a/test/unit/factories/NftFactory.test.ts b/test/unit/factories/NftFactory.test.ts
index 2d70e610..ba594093 100644
--- a/test/unit/factories/NftFactory.test.ts
+++ b/test/unit/factories/NftFactory.test.ts
@@ -164,7 +164,7 @@ describe('Nft Factory test', () => {
       poolParams.vestingAmount
     )
 
-    const txReceipt = await nftFactory.createNftErc20WithPool(
+    const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
       nftOwner,
       nftData,
       ercParams,
diff --git a/test/unit/pools/Router.test.ts b/test/unit/pools/Router.test.ts
index 3fc84573..3f348985 100644
--- a/test/unit/pools/Router.test.ts
+++ b/test/unit/pools/Router.test.ts
@@ -152,7 +152,7 @@ describe('Router unit test', () => {
     }
 
     const nftFactory = new NftFactory(contracts.nftFactoryAddress, web3)
-    const txReceipt = await nftFactory.createNftErc20WithPool(
+    const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
       factoryOwner,
       NFT_DATA,
       ERC_PARAMS,
@@ -163,7 +163,7 @@ describe('Router unit test', () => {
     const pool1 = txReceipt.events.NewPool.returnValues.poolAddress
 
     // CREATE A SECOND POOL
-    const txReceipt2 = await nftFactory.createNftErc20WithPool(
+    const txReceipt2 = await nftFactory.createNftWithDatatokenWithPool(
       factoryOwner,
       NFT_DATA,
       ERC_PARAMS,
diff --git a/test/unit/pools/balancer/Pool.test.ts b/test/unit/pools/balancer/Pool.test.ts
index 029bf7bb..fe1ac95e 100644
--- a/test/unit/pools/balancer/Pool.test.ts
+++ b/test/unit/pools/balancer/Pool.test.ts
@@ -130,7 +130,7 @@ describe('Pool unit test', () => {
 
       const nftFactory = new NftFactory(contracts.nftFactoryAddress, web3, 8996)
 
-      const txReceipt = await nftFactory.createNftErc20WithPool(
+      const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
         factoryOwner,
         nftData,
         ercParams,
@@ -517,7 +517,7 @@ describe('Pool unit test', () => {
 
       const nftFactory = new NftFactory(contracts.nftFactoryAddress, web3, 8996)
 
-      const txReceipt = await nftFactory.createNftErc20WithPool(
+      const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
         factoryOwner,
         nftData,
         ercParams,
diff --git a/test/unit/pools/ssContracts/SideStaking.test.ts b/test/unit/pools/ssContracts/SideStaking.test.ts
index d2c36b16..0833e770 100644
--- a/test/unit/pools/ssContracts/SideStaking.test.ts
+++ b/test/unit/pools/ssContracts/SideStaking.test.ts
@@ -153,7 +153,7 @@ describe('SideStaking unit test', () => {
         swapFeeMarketRunner: '0.001'
       }
 
-      const txReceipt = await nftFactory.createNftErc20WithPool(
+      const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
         factoryOwner,
         nftData,
         ercParams,
@@ -375,7 +375,7 @@ describe('SideStaking unit test', () => {
         swapFeeMarketRunner: '0.001'
       }
 
-      const txReceipt = await nftFactory.createNftErc20WithPool(
+      const txReceipt = await nftFactory.createNftWithDatatokenWithPool(
         factoryOwner,
         nftData,
         ercParams,