diff --git a/CodeExamples.md b/CodeExamples.md
index b2ad061b..f1b09c01 100644
--- a/CodeExamples.md
+++ b/CodeExamples.md
@@ -252,7 +252,7 @@ For pool creation, the OCEAN token is used as the base token. The base token can
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -294,7 +294,7 @@ Now we can make the contract call
     const tx = await factory.createNftErc20WithPool(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       poolParams
     )
 
@@ -526,7 +526,7 @@ Now let's console log the Consumer balance after order to check everything is wo
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -552,7 +552,7 @@ Now let's console log the Consumer balance after order to check everything is wo
     const tx = await factory.createNftErc20WithFixedRate(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       freParams
     )
 
@@ -748,7 +748,7 @@ Lets check that the download URL was successfully received
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -769,7 +769,7 @@ Lets check that the download URL was successfully received
     const tx = await factory.createNftErc20WithDispenser(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       dispenserParams
     )
 
diff --git a/test/integration/CodeExamples.test.ts b/test/integration/CodeExamples.test.ts
index 3c0c81f8..193d9a04 100644
--- a/test/integration/CodeExamples.test.ts
+++ b/test/integration/CodeExamples.test.ts
@@ -252,7 +252,7 @@ describe('Marketplace flow tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -294,7 +294,7 @@ describe('Marketplace flow tests', async () => {
     const tx = await factory.createNftErc20WithPool(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       poolParams
     )
 
@@ -526,7 +526,7 @@ describe('Marketplace flow tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -552,7 +552,7 @@ describe('Marketplace flow tests', async () => {
     const tx = await factory.createNftErc20WithFixedRate(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       freParams
     )
 
@@ -748,7 +748,7 @@ describe('Marketplace flow tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -769,7 +769,7 @@ describe('Marketplace flow tests', async () => {
     const tx = await factory.createNftErc20WithDispenser(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       dispenserParams
     )
 
diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index 00f4b57f..2713e7a9 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -232,7 +232,7 @@ async function createAsset(
     transferable: true,
     owner: owner
   }
-  const erc20ParamsAsset: DatatokenCreateParams = {
+  const datatokenParams: DatatokenCreateParams = {
     templateIndex: 1,
     cap: '100000',
     feeAmount: '0',
@@ -242,7 +242,7 @@ async function createAsset(
     mpFeeAddress: ZERO_ADDRESS
   }
 
-  const result = await Factory.createNftWithErc20(owner, nftParamsAsset, erc20ParamsAsset)
+  const result = await Factory.createNftWithErc20(owner, nftParamsAsset, datatokenParams)
 
   const nftAddress = result.events.NFTCreated.returnValues[0]
   const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
diff --git a/test/integration/PublishFlows.test.ts b/test/integration/PublishFlows.test.ts
index 3bcd3caf..c7e84948 100644
--- a/test/integration/PublishFlows.test.ts
+++ b/test/integration/PublishFlows.test.ts
@@ -107,7 +107,7 @@ describe('Publish tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -136,7 +136,7 @@ describe('Publish tests', async () => {
     const bundleNFT = await factory.createNftErc20WithPool(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       poolParams
     )
 
@@ -191,7 +191,7 @@ describe('Publish tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -217,7 +217,7 @@ describe('Publish tests', async () => {
     const bundleNFT = await factory.createNftErc20WithFixedRate(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       fixedPriceParams
     )
 
@@ -270,7 +270,7 @@ describe('Publish tests', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -291,7 +291,7 @@ describe('Publish tests', async () => {
     const bundleNFT = await factory.createNftErc20WithDispenser(
       publisherAccount,
       nftParams,
-      erc20Params,
+      datatokenParams,
       dispenserParams
     )
 
diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts
index c38e537b..eab987c1 100644
--- a/test/integration/SimplePublishConsumeFlow.test.ts
+++ b/test/integration/SimplePublishConsumeFlow.test.ts
@@ -86,7 +86,7 @@ describe('Simple Publish & consume test', async () => {
       owner: publisherAccount
     }
 
-    const erc20Params: DatatokenCreateParams = {
+    const datatokenParams: DatatokenCreateParams = {
       templateIndex: 1,
       cap: '100000',
       feeAmount: '0',
@@ -96,7 +96,11 @@ describe('Simple Publish & consume test', async () => {
       mpFeeAddress: ZERO_ADDRESS
     }
 
-    const tx = await Factory.createNftWithErc20(publisherAccount, nftParams, erc20Params)
+    const tx = await Factory.createNftWithErc20(
+      publisherAccount,
+      nftParams,
+      datatokenParams
+    )
     const nftAddress = tx.events.NFTCreated.returnValues[0]
     const datatokenAddress = tx.events.TokenCreated.returnValues[0]