diff --git a/src/contracts/factories/NFTFactory.ts b/src/contracts/factories/NFTFactory.ts
index e30fdd65..196a3f70 100644
--- a/src/contracts/factories/NFTFactory.ts
+++ b/src/contracts/factories/NFTFactory.ts
@@ -163,7 +163,7 @@ export class NftFactory extends SmartContractWithAddress {
     return template
   }
 
-  /** Get Datatoken(ERC20) Template
+  /** Get Datatoken (ERC20) Template
    * @param {Number} index Template index
    * @return {Promise<Template>} DT Template info
    */
@@ -563,14 +563,14 @@ export class NftFactory extends SmartContractWithAddress {
   }
 
   /**
-   * Estimate gas cost for createNftWithErc20 method
+   * Estimate gas cost for createNftWithDatatoken method
    * @param address Caller address
    * @param _NftCreateData input data for NFT creation
    * @param _ErcCreateData input data for Datatoken creation
    *  @return {Promise<TransactionReceipt>} transaction receipt
    */
 
-  public async estGasCreateNftWithErc20(
+  public async estGasCreateNftWithDatatoken(
     address: string,
     nftCreateData: NftCreateData,
     ercParams: DatatokenCreateParams
@@ -585,7 +585,7 @@ export class NftFactory extends SmartContractWithAddress {
   }
 
   /**
-   * @dev createNftWithErc20
+   * @dev createNftWithDatatoken
    *      Creates a new NFT, then a Datatoken,all in one call
    * @param address Caller address
    * @param _NftCreateData input data for nft creation
@@ -593,7 +593,7 @@ export class NftFactory extends SmartContractWithAddress {
    * @return {Promise<TransactionReceipt>} transaction receipt
    */
 
-  public async createNftWithErc20(
+  public async createNftWithDatatoken(
     address: string,
     nftCreateData: NftCreateData,
     ercParams: DatatokenCreateParams
diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index 2713e7a9..d2305d27 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -242,7 +242,11 @@ async function createAsset(
     mpFeeAddress: ZERO_ADDRESS
   }
 
-  const result = await Factory.createNftWithErc20(owner, nftParamsAsset, datatokenParams)
+  const result = await Factory.createNftWithDatatoken(
+    owner,
+    nftParamsAsset,
+    datatokenParams
+  )
 
   const nftAddress = result.events.NFTCreated.returnValues[0]
   const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts
index 2720b2dc..857763a3 100644
--- a/test/integration/SimplePublishConsumeFlow.test.ts
+++ b/test/integration/SimplePublishConsumeFlow.test.ts
@@ -96,7 +96,7 @@ describe('Simple Publish & consume test', async () => {
       mpFeeAddress: ZERO_ADDRESS
     }
 
-    const tx = await Factory.createNftWithErc20(
+    const tx = await Factory.createNftWithDatatoken(
       publisherAccount,
       nftParams,
       datatokenParams
diff --git a/test/unit/factories/NftFactory.test.ts b/test/unit/factories/NftFactory.test.ts
index d08fc1fb..2d70e610 100644
--- a/test/unit/factories/NftFactory.test.ts
+++ b/test/unit/factories/NftFactory.test.ts
@@ -105,7 +105,11 @@ describe('Nft Factory test', () => {
 
   it('#createNftwithErc - should create an NFT and a Datatoken', async () => {
     // we prepare transaction parameters objects
-    const txReceipt = await nftFactory.createNftWithErc20(nftOwner, nftData, ercParams)
+    const txReceipt = await nftFactory.createNftWithDatatoken(
+      nftOwner,
+      nftData,
+      ercParams
+    )
 
     // events have been emitted
     expect(txReceipt.events.NFTCreated.event === 'NFTCreated')
@@ -120,7 +124,7 @@ describe('Nft Factory test', () => {
     const currentNFTCount = await nftFactory.getCurrentNFTCount()
     const currentTokenCount = await nftFactory.getCurrentTokenCount()
 
-    await nftFactory.createNftWithErc20(nftOwner, nftData, ercParams)
+    await nftFactory.createNftWithDatatoken(nftOwner, nftData, ercParams)
 
     expect((await nftFactory.getCurrentNFTCount()) === currentNFTCount + 1)
     expect((await nftFactory.getCurrentTokenCount()) === currentTokenCount + 1)
diff --git a/test/unit/pools/dispenser/Dispenser.test.ts b/test/unit/pools/dispenser/Dispenser.test.ts
index 8d0602c3..41715c0f 100644
--- a/test/unit/pools/dispenser/Dispenser.test.ts
+++ b/test/unit/pools/dispenser/Dispenser.test.ts
@@ -66,7 +66,7 @@ describe('Dispenser flow', () => {
   it('#createNftwithErc - should create an NFT and a Datatoken ', async () => {
     nftFactory = new NftFactory(contracts.nftFactoryAddress, web3)
 
-    const txReceipt = await nftFactory.createNftWithErc20(
+    const txReceipt = await nftFactory.createNftWithDatatoken(
       factoryOwner,
       nftData,
       ercParams