diff --git a/src/utils/DdoHelpers.ts b/src/utils/DdoHelpers.ts
index 78bdbadd..bf2743ce 100644
--- a/src/utils/DdoHelpers.ts
+++ b/src/utils/DdoHelpers.ts
@@ -2,9 +2,9 @@ import sha256 from 'crypto-js/sha256'
 import Web3 from 'web3'
 import { LoggerInstance } from '.'
 
-export function generateDid(erc721Address: string, chainId: number): string {
-  erc721Address = Web3.utils.toChecksumAddress(erc721Address)
-  const checksum = sha256(erc721Address + chainId.toString(10))
+export function generateDid(nftAddress: string, chainId: number): string {
+  nftAddress = Web3.utils.toChecksumAddress(nftAddress)
+  const checksum = sha256(nftAddress + chainId.toString(10))
   return `did:op:${checksum.toString()}`
 }
 
diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index aa494b08..e26a2465 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -244,7 +244,7 @@ async function createAsset(
 
   const result = await Factory.createNftWithErc20(owner, nftParamsAsset, erc20ParamsAsset)
 
-  const erc721AddressAsset = result.events.NFTCreated.returnValues[0]
+  const nftAddress = result.events.NFTCreated.returnValues[0]
   const datatokenAddressAsset = result.events.TokenCreated.returnValues[0]
   // create the files encrypted string
   let providerResponse = await ProviderInstance.encrypt(assetUrl, providerUrl)
@@ -252,16 +252,15 @@ async function createAsset(
   ddo.services[0].datatokenAddress = datatokenAddressAsset
   ddo.services[0].serviceEndpoint = providerUrl
   // update ddo and set the right did
-  ddo.nftAddress = web3.utils.toChecksumAddress(erc721AddressAsset)
+  ddo.nftAddress = web3.utils.toChecksumAddress(nftAddress)
   ddo.id =
-    'did:op:' +
-    SHA256(web3.utils.toChecksumAddress(erc721AddressAsset) + chain.toString(10))
+    'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10))
   providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
   const encryptedResponse = await providerResponse
   const validateResult = await aquarius.validate(ddo)
   assert(validateResult.valid, 'Could not validate metadata')
   await nft.setMetadata(
-    erc721AddressAsset,
+    nftAddress,
     owner,
     0,
     providerUrl,
diff --git a/test/integration/SimplePublishConsumeFlow.test.ts b/test/integration/SimplePublishConsumeFlow.test.ts
index 1036ed69..1e101536 100644
--- a/test/integration/SimplePublishConsumeFlow.test.ts
+++ b/test/integration/SimplePublishConsumeFlow.test.ts
@@ -97,7 +97,7 @@ describe('Simple Publish & consume test', async () => {
     }
 
     const tx = await Factory.createNftWithErc20(publisherAccount, nftParams, erc20Params)
-    const erc721Address = tx.events.NFTCreated.returnValues[0]
+    const nftAddress = tx.events.NFTCreated.returnValues[0]
     const datatokenAddress = tx.events.TokenCreated.returnValues[0]
 
     // create the files encrypted string
@@ -105,16 +105,16 @@ describe('Simple Publish & consume test', async () => {
     ddo.services[0].files = await providerResponse
     ddo.services[0].datatokenAddress = datatokenAddress
     // update ddo and set the right did
-    ddo.nftAddress = erc721Address
+    ddo.nftAddress = nftAddress
     const chain = await web3.eth.getChainId()
     ddo.id =
-      'did:op:' + SHA256(web3.utils.toChecksumAddress(erc721Address) + chain.toString(10))
+      'did:op:' + SHA256(web3.utils.toChecksumAddress(nftAddress) + chain.toString(10))
 
     providerResponse = await ProviderInstance.encrypt(ddo, providerUrl)
     const encryptedResponse = await providerResponse
     const metadataHash = getHash(JSON.stringify(ddo))
     await nft.setMetadata(
-      erc721Address,
+      nftAddress,
       publisherAccount,
       0,
       providerUrl,