diff --git a/git b/git
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/token/ERC721/ERC721.test.js b/test/token/ERC721/ERC721.test.js
index 484061e96..becd96d12 100644
--- a/test/token/ERC721/ERC721.test.js
+++ b/test/token/ERC721/ERC721.test.js
@@ -6,7 +6,7 @@ const { expect } = require('chai');
 const { shouldBehaveLikeERC721 } = require('./ERC721.behavior');
 const ERC721Mock = artifacts.require('ERC721Mock.sol');
 
-contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
+contract('ERC721', function ([_, creator, owner, other, ...accounts]) {
   beforeEach(async function () {
     this.token = await ERC721Mock.new({ from: creator });
   });
@@ -25,20 +25,20 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
 
       context('with minted token', async function () {
         beforeEach(async function () {
-          ({ logs: this.logs } = await this.token.mint(tokenOwner, tokenId));
+          ({ logs: this.logs } = await this.token.mint(owner, tokenId));
         });
 
         it('emits a Transfer event', function () {
-          expectEvent.inLogs(this.logs, 'Transfer', { from: ZERO_ADDRESS, to: tokenOwner, tokenId });
+          expectEvent.inLogs(this.logs, 'Transfer', { from: ZERO_ADDRESS, to: owner, tokenId });
         });
 
         it('creates the token', async function () {
-          expect(await this.token.balanceOf(tokenOwner)).to.be.bignumber.equal('1');
-          expect(await this.token.ownerOf(tokenId)).to.equal(tokenOwner);
+          expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('1');
+          expect(await this.token.ownerOf(tokenId)).to.equal(owner);
         });
 
         it('reverts when adding a token id that already exists', async function () {
-          await expectRevert(this.token.mint(tokenOwner, tokenId), 'ERC721: token already minted');
+          await expectRevert(this.token.mint(owner, tokenId), 'ERC721: token already minted');
         });
       });
     });
@@ -46,13 +46,13 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
     describe('_burn(address, uint256)', function () {
       it('reverts when burning a non-existent token id', async function () {
         await expectRevert(
-          this.token.methods['burn(address,uint256)'](tokenOwner, tokenId), 'ERC721: owner query for nonexistent token'
+          this.token.methods['burn(address,uint256)'](owner, tokenId), 'ERC721: owner query for nonexistent token'
         );
       });
 
       context('with minted token', function () {
         beforeEach(async function () {
-          await this.token.mint(tokenOwner, tokenId);
+          await this.token.mint(owner, tokenId);
         });
 
         it('reverts when the account is not the owner', async function () {
@@ -63,15 +63,15 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
 
         context('with burnt token', function () {
           beforeEach(async function () {
-            ({ logs: this.logs } = await this.token.methods['burn(address,uint256)'](tokenOwner, tokenId));
+            ({ logs: this.logs } = await this.token.methods['burn(address,uint256)'](owner, tokenId));
           });
 
           it('emits a Transfer event', function () {
-            expectEvent.inLogs(this.logs, 'Transfer', { from: tokenOwner, to: ZERO_ADDRESS, tokenId });
+            expectEvent.inLogs(this.logs, 'Transfer', { from: owner, to: ZERO_ADDRESS, tokenId });
           });
 
           it('deletes the token', async function () {
-            expect(await this.token.balanceOf(tokenOwner)).to.be.bignumber.equal('0');
+            expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('0');
             await expectRevert(
               this.token.ownerOf(tokenId), 'ERC721: owner query for nonexistent token'
             );
@@ -79,7 +79,7 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
 
           it('reverts when burning a token id that has been deleted', async function () {
             await expectRevert(
-              this.token.methods['burn(address,uint256)'](tokenOwner, tokenId),
+              this.token.methods['burn(address,uint256)'](owner, tokenId),
               'ERC721: owner query for nonexistent token'
             );
           });
@@ -96,7 +96,7 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
 
       context('with minted token', function () {
         beforeEach(async function () {
-          await this.token.mint(tokenOwner, tokenId);
+          await this.token.mint(owner, tokenId);
         });
 
         context('with burnt token', function () {
@@ -105,11 +105,11 @@ contract('ERC721', function ([_, creator, tokenOwner, other, ...accounts]) {
           });
 
           it('emits a Transfer event', function () {
-            expectEvent.inLogs(this.logs, 'Transfer', { from: tokenOwner, to: ZERO_ADDRESS, tokenId });
+            expectEvent.inLogs(this.logs, 'Transfer', { from: owner, to: ZERO_ADDRESS, tokenId });
           });
 
           it('deletes the token', async function () {
-            expect(await this.token.balanceOf(tokenOwner)).to.be.bignumber.equal('0');
+            expect(await this.token.balanceOf(owner)).to.be.bignumber.equal('0');
             await expectRevert(
               this.token.ownerOf(tokenId), 'ERC721: owner query for nonexistent token'
             );
diff --git a/test/token/ERC721/ERC721Full.test.js b/test/token/ERC721/ERC721Full.test.js
index bc96df080..23a8b8f15 100644
--- a/test/token/ERC721/ERC721Full.test.js
+++ b/test/token/ERC721/ERC721Full.test.js
@@ -22,7 +22,7 @@ contract('ERC721Full', function ([
   const [
     owner,
     newOwner,
-    another,
+    other,
   ] = accounts;
 
   beforeEach(async function () {
@@ -143,21 +143,21 @@ contract('ERC721Full', function ([
       describe('when the given address does not own any token', function () {
         it('reverts', async function () {
           await expectRevert(
-            this.token.tokenOfOwnerByIndex(another, 0), 'ERC721Enumerable: owner index out of bounds'
+            this.token.tokenOfOwnerByIndex(other, 0), 'ERC721Enumerable: owner index out of bounds'
           );
         });
       });
 
       describe('after transferring all tokens to another user', function () {
         beforeEach(async function () {
-          await this.token.transferFrom(owner, another, firstTokenId, { from: owner });
-          await this.token.transferFrom(owner, another, secondTokenId, { from: owner });
+          await this.token.transferFrom(owner, other, firstTokenId, { from: owner });
+          await this.token.transferFrom(owner, other, secondTokenId, { from: owner });
         });
 
         it('returns correct token IDs for target', async function () {
-          expect(await this.token.balanceOf(another)).to.be.bignumber.equal('2');
+          expect(await this.token.balanceOf(other)).to.be.bignumber.equal('2');
           const tokensListed = await Promise.all(
-            [0, 1].map(i => this.token.tokenOfOwnerByIndex(another, i))
+            [0, 1].map(i => this.token.tokenOfOwnerByIndex(other, i))
           );
           expect(tokensListed.map(t => t.toNumber())).to.have.members([firstTokenId.toNumber(),
             secondTokenId.toNumber()]);
diff --git a/test/token/ERC721/ERC721PausedToken.behavior.js b/test/token/ERC721/ERC721PausedToken.behavior.js
index b758f1859..dfc810a45 100644
--- a/test/token/ERC721/ERC721PausedToken.behavior.js
+++ b/test/token/ERC721/ERC721PausedToken.behavior.js
@@ -3,7 +3,7 @@ const { ZERO_ADDRESS } = constants;
 
 const { expect } = require('chai');
 
-function shouldBehaveLikeERC721PausedToken (owner, [recipient, operator]) {
+function shouldBehaveLikeERC721PausedToken (owner, [receiver, operator]) {
   const firstTokenId = new BN(1);
   const mintedTokens = new BN(1);
   const mockData = '0x42';
@@ -15,7 +15,7 @@ function shouldBehaveLikeERC721PausedToken (owner, [recipient, operator]) {
 
     it('reverts when trying to approve', async function () {
       await expectRevert(
-        this.token.approve(recipient, firstTokenId, { from: owner }), 'Pausable: paused'
+        this.token.approve(receiver, firstTokenId, { from: owner }), 'Pausable: paused'
       );
     });
 
@@ -27,20 +27,20 @@ function shouldBehaveLikeERC721PausedToken (owner, [recipient, operator]) {
 
     it('reverts when trying to transferFrom', async function () {
       await expectRevert(
-        this.token.transferFrom(owner, recipient, firstTokenId, { from: owner }), 'Pausable: paused'
+        this.token.transferFrom(owner, receiver, firstTokenId, { from: owner }), 'Pausable: paused'
       );
     });
 
     it('reverts when trying to safeTransferFrom', async function () {
       await expectRevert(
-        this.token.safeTransferFrom(owner, recipient, firstTokenId, { from: owner }), 'Pausable: paused'
+        this.token.safeTransferFrom(owner, receiver, firstTokenId, { from: owner }), 'Pausable: paused'
       );
     });
 
     it('reverts when trying to safeTransferFrom with data', async function () {
       await expectRevert(
         this.token.methods['safeTransferFrom(address,address,uint256,bytes)'](
-          owner, recipient, firstTokenId, mockData, { from: owner }
+          owner, receiver, firstTokenId, mockData, { from: owner }
         ), 'Pausable: paused'
       );
     });